From 22445de76b6665047b51e0532b0d5d8d37ba396e Mon Sep 17 00:00:00 2001 From: oliskoli Date: Fri, 30 Sep 2005 23:14:22 +0000 Subject: [PATCH] Sync changes with source tree; rel. 0.2 --- win32/gui-2/GPSBabelGUI2.dof | 20 +++--- win32/gui-2/GPSBabelGUI2.res | Bin 1584 -> 1764 bytes win32/gui-2/about.dfm | Bin 4280 -> 3330 bytes win32/gui-2/about.pas | 75 ++++++++++++++++----- win32/gui-2/common.pas | 53 +++++++++++++++ win32/gui-2/main.pas | 20 +++++- win32/gui-2/template.po | 124 ++++++++++++++++++++++------------- 7 files changed, 221 insertions(+), 71 deletions(-) diff --git a/win32/gui-2/GPSBabelGUI2.dof b/win32/gui-2/GPSBabelGUI2.dof index f23784e01..2c7bc906e 100644 --- a/win32/gui-2/GPSBabelGUI2.dof +++ b/win32/gui-2/GPSBabelGUI2.dof @@ -55,26 +55,26 @@ HostApplication= IncludeVerInfo=1 AutoIncBuild=0 MajorVer=0 -MinorVer=1 +MinorVer=2 Release=0 Build=0 Debug=0 -PreRelease=0 +PreRelease=1 Special=0 Private=0 DLL=0 -Locale=1031 +Locale=1033 CodePage=1252 [Version Info Keys] -CompanyName= -FileDescription=GPSBabel Frontend -FileVersion=0.1.0.0 -InternalName= -LegalCopyright= +CompanyName=GPSBabel Makers +FileDescription=GPSBabel Windows Frontend +FileVersion=0.2.0.0 +InternalName=GPSBabelGUI-2 +LegalCopyright=(C) 2005 Olaf Klein (O.B.Klein@T-Online.de) LegalTrademarks= -OriginalFilename= +OriginalFilename=GPSBabelGUI2.exe ProductName=GPSBabel -ProductVersion=1.0.0.0 +ProductVersion=1.2.7 Comments= [HistoryLists\hlConditionals] Count=1 diff --git a/win32/gui-2/GPSBabelGUI2.res b/win32/gui-2/GPSBabelGUI2.res index cdff893945df1d156196ece604b743d0ff5b3d17..cf12ba747cc1b3ce0a5eb499d3a040a451142d4f 100644 GIT binary patch delta 344 zcmZ{eK}rKb5JjKqZb5J~A|fc!hy)YRaR`wR5E2v#8YF@ST?i7*1jHeNS?EG=>&k_7 z0I!ghS8(ORJ7gnX!kQ7mjolRW`~Rxne=t7u29Zgf80ndXxIGzvCdJSB?NxoI& MmUnk%$L!F41555ZB>(^b delta 202 zcmaFDyMbpz4l~mdrpbBCav-XYSx=Oa0RmvOJ%~H`BC|Ln)8v=T%F_415(W$=3Rv__Gl(wo+B_x_SaTAf$RqWDMf`uQ`#B?%ajVC1S zCQ>)7K#D9O_yu-|4SWD!f%pcNEQ{?tnyL#H>_#(l&zXDfIrDAp@=pFL$!T({St=`s z8duEyPLJ}diCsRb5hwbG`?7Nx$)xRWyQ~`!)lGuGqS$UU7uODS43X$y31SARcad1( z*CO7PxaxgREDyPqf}5o0!X|kGh5Yo|Y>SI)jQ~+VM$N`-W1#_087~H`d?R*bTdWg} zN8&YTw>yl_2$JqFo8b5ptz)~up`=aqE(n%7Wq_Ol)`4K}KnoFOHzp~)VD4sjW@ z0KwdpF@cO1kh(tDJm=jB=g(_SvD9NkwJ)GJV^2*gL9wto1I!>pqdInx&IonKpu@0} z=v!_K%kSLoBt0$iU*gWdV#qjbHA0Z+M=q4(}Z8 zj6SRjaTAqM4|>J)){sjc=+qxna4ZT6mXK|p3CWNwT;CX1Hr&6S)l|9^G9==hw}P3> zi?{VJ@s`8cZ3o3PCU+y>r{?D}xlz5k#lp|Flm$vpm4f&JSG{U!_5t?R#$pjaXRU#ZGY7N_EWis#`Gno2$7J_jGK20(Zy^hvXLDLPD5l0Nr z53Ht_6hBh7NL#k+WC&1rVVVpng2-uFH${OamXz3W9Y=!2z$iSV6n&BjQKUdo zzBmP9Z4rBzg^ zef{1$zI*SyailJ+u4JB`lG%+2fSt=zTDYVoQ%&RhL46S}!(SQ|D` z@ohKdH}F-&zsLOA4XuWglPg7~s96oAh#jNM$NP*^Xew`RvIFm7YBQNYfUrEiMwk24wpfk~893z~&Zxo&ZJebtGG zX--6=q4dc>EfLXN!Co>e>{t~u$gbd>Qb__b;Gu>tZF5nsEAKCA#U13j_wjiGg@+o)=Xat@J{Q%s;1m6*2nWf8@FQc8E9rXC| zWAxy`A-Z+zS2R2OC$x0XrAr-j_ihK;I;hj>`2C}gYh)m;R|X)`9E8Z$y+P1jB;>tM zBI#p7s$UWEA*^|94^c{IDE*p{WlD$(m_Vli6Dj?OG$~yqw?QV6VS57oo{$gx&hrSR z7&bjaza?ay(k}@q`PkWAfzr>(7R*8Kk?m=8az=q4r4`~b>>EPnQxqvFbe4Wc$bE(Z zn@=e{t{`9o?F?f5@4%Xm80Ir!7_gyqcMmuMlPW`eHV^485T5}i%NzqXRk{cAoeh{U zc#UjRm~J;@!Z5ZP+cRLY&gv`yn^pAa*zqnC1_FDK3+4cwgvn3gmgnp(VB=mI!bpwGe_oYPI+ao=}9`Li_vs(BS!hDtEje08a@2kUdalS_f@p_~kacSGFfd4anc}Vc! zeD;nI+W9{-TZ66TdB4Rn9H?s1)m%gOU4F0lI`@F5xCcBPc)-K~3Qg7SFg*n;PDfW1OI;;(MVVSG z6th|hn~OJ>&Rux>`Nd?(awBV-8)&?sIj~nOjFV#u9P$Cg4%U-FeDzDHN-?_qva9i6 z=Ly>F9>!1H__Vr-m9hg|v9+O;ZAYop8zrVb_z-F}4M5Yduu^yIilfznZJW}~416G4 zm`BkmF0mgD%ag@Tn`Cqyn=BBHXh0Zh0&j5F!nbxVa4qi)ZtZx^u5UXm{Ci=x6+G3D zZJmnZF_T5><)4eMz@83J8 z1%7LU8@&XVM|cG{)E|BSEGC1GUJpO|m%B%Ccr}%^DxVbfW 0) then exit; + + GetMem(buff, len); + try + + if not GetFileVersionInfo(PChar(FileName), 0, len, buff) then Exit; + + fix := Pointer(buff); + i := len - SizeOf(fix^); + while (i > 0) do + begin + Dec(i); + if (fix.dwSignature = $feef04bd) then + begin + CFixedFileinfo := fix^; + Break; + end; + PChar(fix) := PChar(fix) + 1; + end; + + if not VerQueryValue(buff, PChar('\\StringFileInfo\\040904E4\\FileVersion'), + Pointer(sub), sublen) then Exit; + if not(sublen > 0) then Exit; + Result := string(sub); + finally + FreeMem(buff); + end; +end; + initialization gpsbabel_exe := SysUtils.ExtractFilePath(ParamStr(0)) + 'gpsbabel.exe'; + SGPSBabelGUIVersion := GetFileVersion(ParamStr(0)); end. diff --git a/win32/gui-2/main.pas b/win32/gui-2/main.pas index 8775dfba8..6e46e02c2 100644 --- a/win32/gui-2/main.pas +++ b/win32/gui-2/main.pas @@ -149,7 +149,25 @@ var begin gnugettextD4.TranslateComponent(SELF); - Caption := Caption + _(' (Preview)'); +// VS_FF_DEBUG The file contains debugging information or is compiled with debugging features enabled. +// VS_FF_INFOINFERRED The file's version structure was created dynamically; +// therefore, some of the members in this structure may be empty or incorrect. +// This flag should never be set in a file's VS_VERSION_INFO data. +// VS_FF_PATCHED The file has been modified and is not identical to the original shipping file of the same version number. +// VS_FF_PRERELEASE The file is a development version, not a commercially released product. +// VS_FF_PRIVATEBUILD The file was not built using standard release procedures. If this flag is set, +// the StringFileInfo structure should contain a PrivateBuild entry. +// VS_FF_SPECIALBUILD The file was built by the original company using standard release procedures +// but is a variation of the normal file of the same version number. +// If this flag is set, the StringFileInfo structure should contain a SpecialBuild + + if (CFixedFileinfo.dwFileFlags and VS_FF_PRERELEASE <> 0) then + Caption := Format('%s (%s)', [Caption, _('BETA')]) + else if (CFixedFileinfo.dwFileFlags and VS_FF_PRIVATEBUILD <> 0) then + Caption := Format('%s (%s)', [Caption, _('Private release')]) + else if (CFixedFileinfo.dwFileFlags and VS_FF_SPECIALBUILD <> 0) then + Caption := Format('%s (%s)', [Caption, _('Special release')]); + FCaps := TCapabilities.Create; diff --git a/win32/gui-2/template.po b/win32/gui-2/template.po index 52fbfe8e4..b92b31703 100644 --- a/win32/gui-2/template.po +++ b/win32/gui-2/template.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2005-09-30 03:39\n" -"PO-Revision-Date: 2005-09-30 03:39\n" +"POT-Creation-Date: 2005-10-01 00:49\n" +"PO-Revision-Date: 2005-10-01 00:49\n" "Last-Translator: Somebody \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,14 +22,12 @@ msgstr "" #. frmAbout..Font.Name #: about.dfm:12 -#. frmAbout..pnClient..Panel1..StaticText1..Font.Name -#: about.dfm:125 -#. frmAbout..pnClient..Panel1..StaticText4..Font.Name -#: about.dfm:154 -#. frmAbout..pnClient..Panel1..StaticText5..Font.Name -#: about.dfm:168 -#. frmAbout..pnClient..Panel1..StaticText6..Font.Name -#: about.dfm:182 +#. frmAbout..pnClient..pnCenter..lbURL..Font.Name +#: about.dfm:100 +#. frmAbout..pnClient..pnCenter..lbSFURL..Font.Name +#: about.dfm:131 +#. frmAbout..pnClient..pnCenter..stLicense..Font.Name +#: about.dfm:166 #. frmFilter..Font.Name #: filter.dfm:13 #. frmMain..Font.Name @@ -41,45 +39,62 @@ msgstr "" msgid "MS Sans Serif" msgstr "" -#. frmAbout..pnClient..StaticText3..Caption -#: about.dfm:105 -msgid "... under construction" +#. frmAbout..pnClient..pnCenter..lbHint1..Caption +#: about.dfm:74 +msgid "This program is part of the GPSBabel project, hosted " +"on" msgstr "" -#. frmAbout..pnClient..Panel1..StaticText1..Caption -#: about.dfm:121 -msgid "GPSBabelGUI-2:" +#. frmAbout..pnClient..pnCenter..lbVersion..Caption +#: about.dfm:82 +msgid "Version 0.2" msgstr "" -#. frmAbout..pnClient..Panel1..StaticText2..Caption -#: about.dfm:139 -msgid "The frontend for gpsbabel command line " -"program" +#. frmAbout..pnClient..pnCenter..lbTranslators..Caption +#: about.dfm:89 +msgid "Translations" +msgstr "" + +#. frmAbout..pnClient..pnCenter..lbURL..Caption +#: about.dfm:96 +msgid "www.gpsbabel.org" +msgstr "" + +#. frmAbout..pnClient..pnCenter..lbCopyRight..Caption +#: about.dfm:112 +msgid "Copyright (C) 2005 Olaf Klein (O.B.Klein@T-Online.de)" +msgstr "" + +#. frmAbout..pnClient..pnCenter..lbMoreInfo..Caption +#: about.dfm:119 +msgid "Find more info at" msgstr "" -#. frmAbout..pnClient..Panel1..StaticText4..Caption -#: about.dfm:150 -msgid "Copyright:" +#. frmAbout..pnClient..pnCenter..lbSFURL..Caption +#: about.dfm:126 +msgid "SourceForge.net" msgstr "" -#. frmAbout..pnClient..Panel1..StaticText5..Caption -#: about.dfm:164 -msgid "Licence:" +#. frmAbout..pnClient..pnCenter..stDescription..Caption +#: about.dfm:147 +msgid "The frontend for gpsbabel command line " +"program" msgstr "" -#. frmAbout..pnClient..Panel1..StaticText6..Caption -#: about.dfm:178 -msgid "Translations:" +#. frmAbout..pnClient..pnCenter..stLicense..Caption +#: about.dfm:161 +msgid "THIS SOFTWARE MAY ONLY BE LICENSED FREE OF " +"CHARGE" msgstr "" -#. frmAbout..pnClient..Panel1..StaticText7..Caption -#: about.dfm:196 -msgid "Olaf Klein (O.B.Klein@T-Online.de)" +#. frmAbout..pnClient..pnCenter..lbxTranslators....Items.Strings +#: about.dfm:183 +msgid "German by Olaf Klein" msgstr "" -#. frmAbout..pnClient..Panel1..StaticText8..Caption -#: about.dfm:211 -msgid "Open Source" +#. frmAbout..pnClient..pnCenter..lbxTranslators....Items.Strings +#: about.dfm:184 +msgid "French by Lilian Morinon" msgstr "" #. frmFilter..Caption @@ -324,6 +339,8 @@ msgstr "" #. frmMain..Caption #: main.dfm:6 +#. Programmer's name for it: SGPSBabelTitle +#: common.pas:28 msgid "GPSBabelGUI-2" msgstr "" @@ -503,6 +520,15 @@ msgstr "" msgid "-" msgstr "" +#: about.pas:76 +msgid "Version" +msgstr "" + +#. Programmer's name for it: SGPSBabelURL +#: common.pas:27 +msgid "http://www.gpsbabel.org" +msgstr "" + #: filter.pas:159 msgid "Value (%s) out of range (%g to %g)!" msgstr "" @@ -524,40 +550,48 @@ msgstr "" msgid "Kilometer" msgstr "" -#: main.pas:152 -msgid " (Preview)" +#: main.pas:165 +msgid "BETA" +msgstr "" + +#: main.pas:167 +msgid "Private release" +msgstr "" + +#: main.pas:169 +msgid "Special release" msgstr "" -#: main.pas:259 +#: main.pas:277 msgid "All files|*.*" msgstr "" -#: main.pas:348 +#: main.pas:366 msgid "|All files|*.*" msgstr "" -#: main.pas:389 +#: main.pas:407 msgid "File %s not found." msgstr "" -#: main.pas:406 +#: main.pas:424 msgid "File \"%s\" exists ! Overwrite ?" msgstr "" -#: main.pas:407 +#: main.pas:425 msgid "Warning" msgstr "" -#: main.pas:432 +#: main.pas:450 msgid "Could not run \"gpsbabel.exe\"!" msgstr "" -#: main.pas:441 +#: main.pas:459 msgid "Converted successfully from \"%s\" to " "\"%s\"." msgstr "" -#: main.pas:442 +#: main.pas:460 msgid "Success" msgstr "" -- 2.30.2